Fix and cleanup how we build i386/x86_64 swiotlb.o.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile
index 1914055a26824471883b126dde38cdf5ddf9e2b0..fba91de3c2f10a7ffb58d8bb8178ede8ffb18500 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile
@@ -35,7 +35,6 @@ obj-$(CONFIG_HPET_TIMER)      += time_hpet.o
 obj-$(CONFIG_EFI)              += efi.o efi_stub.o
 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
 obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o
-obj-$(CONFIG_SWIOTLB)          += swiotlb.o
 
 EXTRA_AFLAGS   := -traditional
 

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile b/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile
index bc72d60ac79509e61121e6feddadc1909cfb46f1..804568d747058fc01db86da5e1f5149fb0cf9792 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile
@@ -51,8 +51,6 @@ msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
 
 ifdef CONFIG_XEN
 time-y                         += ../../i386/kernel/time-xen.o
-obj-$(CONFIG_SWIOTLB)          += swiotlb.o
-swiotlb-$(CONFIG_SWIOTLB)      := ../../i386/kernel/swiotlb.o
 pci-dma-y                      += ../../i386/kernel/pci-dma-xen.o
 microcode-$(subst m,y,$(CONFIG_MICROCODE))  := ../../i386/kernel/microcode-xen.o
 quirks-y                       := ../../i386/kernel/quirks-xen.o

diff --git a/linux-2.6-xen-sparse/lib/Makefile b/linux-2.6-xen-sparse/lib/Makefile
index cce2c4d08e7c686b26a395f5da0931cb78d69be0..0db79f11f699212602bb650acb8b8609c3508413 100644 (file)
--- a/linux-2.6-xen-sparse/lib/Makefile
+++ b/linux-2.6-xen-sparse/lib/Makefile
@@ -44,10 +44,9 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
 obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
 obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
 
-ifeq ($(CONFIG_IA64),y)
-obj-$(CONFIG_SWIOTLB) += swiotlb.o
-else ifneq ($(CONFIG_XEN),y)
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
+ifneq ($(CONFIG_IA64),y)
+swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
 endif
 
 hostprogs-y    := gen_crc32table